Bugfix: subpath (uri) was not recognized on site-change
Cleand up unused code