WIP: clean up effectively in manual test
Merge pull request #41 from pmorie/deploy-trigger-wip

WIP: clean up effectively in manual test