#2: Removing unused code