S999: Removing some more gunk