Cleanup (removed unused imports and other things)