Unused code cleanings