Cleanup for curator review (ongoing)

See commit messages for details