Cleanup function added