General cleanup, removed routing