Removed ineffective phases pre-restore, pre-remove and post-remove