Removed excess calls