Clean up comments after last major refactor