cleanup internal classes