Legacy removal part 1

Remove cruft to slightly increase ease of maintenance.