Added a Cleanup Method