clean up + router fix