Cleaning unused code from the previous commit