Removed Class and Dependancy