Refactoring

Combined unpdeploy to 1 stage
Warning message moved to command