fix route issue. cleaning up