Deploy cleanup

Some deployment cleanups