Cleanup deployment process and allow self-contained build