removed junk, adjusted assoc/deassoc, deploy/undeploy doesn't work