minor remove improvements
minor commands tweaks