Fixing up routing errors and removing old bloat.