Removed unwated class declarations