removed redundant Classes and methods