Mark some items as delegated, remove a few more unused things