Pre 2.2.17, cleanup unused functions