Cleanup unused imports and deprecated methods