URL prefix cleanup and other cleanups