refs #344, remove more code that was accidentally merged in