Cleaned up unused classes