clean up for 0.3.2