cleaned up unused classes