Remove Service(shall be moved to Services.bundle) + remove beta in identifiers