Cleanup imports and get compilable again