Cleaning up unused classes