removed unnecessary method calls