Removed all unnecessary imports and unused methods