got rid of unnecessary route logic