Cleanup of imports etc.