SimpleStatus major cleanup