(CSCS2650) Clean up