Removed unnecessary calls