SIT-804, code cleanup