Cleanup

Code cleanup (remove unused imports)