Bugfixes for options with other fommands
Fixed bug where running remove could nuke source tree