Cleanup imports, test on Nexus