final cleanup for 0.4.0