Cleaning up work :metal: