Clear route layer and some other improvements