cleaning up deploy and helper code.