further simplifications, deploy target