Removed a couple classes