Remove extra calls