Remove unused code (look at previous commit as reference)