Restructured clean deployment to leverage common.sh