Add some Cleanup