Added more cleanups to remove unused code.
Signed-off-by: NBen Collins <bcollins@debian.org>
Signed-off-by: NStefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: NJody McIntyre <scjody@modernduck.com>