Fix Clean up