Add Cleanup and enhance trobleshooting