last cleanup for 0.1