Item12952: delete more weird code; fix some data types on save; fix reporting changes