Removed unwanted class declarations