Code cleanup

15 jobs for spidr_fix in 17 minutes and 23 seconds (queued for 3 seconds)