Clean up imports, config, build file