Removed excess code. Refs #29