Doing some cleanup I forgot in the last commit