Removed unnecessary identifiers