Removed additional code for 2.2