Removed all unnecessary imports and unused methods
Fixed remaining warnings