Cleans out some unneeded code. Refs #155.