Implement better cleanup