Remove unneeded code and fix area highways issue