Update ownerships, HNI toggle and clean up

-Individual ownership  restrictions
-Parameter files clean up
-HNI and Non-HNI toggle