4.0.1 and clean up