Merge branch 'gmcgath/cleanup' into fitsblitz/patches