Cleanup code for test deploy