cleanup of fix