Removing function calls