adding 'rmpath' and consolidating some schema objects