removed redundant methods from classes