Cleaning up some leftover debug functions