rm old stuff
layered prop extraction wip