Buildingcommands cleanup

Coming soon to all command files near you