Remove the unused code