added back support for regions and props
removed unused code