removed unneeded imports, removed unused methods