#2 Remove Unused code