5.11.
[cleanup-sw-datatypes] SW data types should be cleaned up