Remove some remaining system specific stuff