Cleanup for 0.2.4