Removed unrequired classes