Code simplifications based on abolishing 2011.