ADMINUI-1967 get rid of old / unused code, move things into new location