Cleanup imports (not finished yet)