Cleanup router class