Remove code which wanted to be removed.
Remove some cruft