Updated revert script to remove more lingering artefacts