Clean up Morgan's mess
Clean up Morgan's mess

Signed-off-by: Joseph Palermo <e623ceb69d4eba908c7aa121d8a6c4c407e290f1@pivotal.io>

cloudfoundry-incubator/switchboard,cloudfoundry-incubator/switchboard,cloudfoundry-incubator/switchboard,cloudfoundry-incubator/switchboard