Cleaning up help routing