removed unused code for 2.1