more cleanup... trying to cut down on extra routes