(CSCS2650) More cleanup of final