Remove more un-used cruft at the moment.