Remove extra function