Moved the deletion part to the manager