Remove redundant Fujitsu config
Remove crefno value
Add unit number and suffix values
Remove leading zero from unit numbers