Removing unnescessary Classes