Removed warnings from classes