SH856 v4010 clean up