Cleaned up router cruft