Remove some cargo culting