Removed 2.1 functions.