Shove more unneeded stuff overboard.

Ticket: #5147