Removing unnecessary code from 11.1