Cleanup WIP lines from #36