Added a cleanup