Remove duplicate code.

Found duplicate functionality and mistyped routes that needed to be
removed.