Yet more code removal and cleanup.