Removal of function calls which are not present in version 1