Removed legacy classes and useless code