(Temporarily) reverted to a working state
Clean-up