Push this into another cleanup method - so that we can leverage it for other operations in future.