Addressing a batch of items found via Scrutinizer-CI, primarily Unused Code