Cleanup for version 0.4.0.