tidy up of unused classes