clean up (3.0.5)