Removed miscellaneous tidbits leftover from copy/paste