Removed Extra Classes