minor: cleaned up a couple of extraneous routines