Feature: Remove some deprecated desused code.