Removing Unnecessary Class