cleaning up unused classes