Removed a number of unused class declarations