Added a cleanup, not tested yet