Merge "Remove residual package"