Cleaning up for 1.0.4