cleanup for 0.2.1