Merge after cleaning up repo