Cleanup stuff that made it into the commit accidentally