Cleaning unused code