Removed additional classes