Remove some workaround files