clean up cargo culting