Remove this function call