Cleanup in preparation for swc build