removing black magic; merging router with app