(CITS2200) branch clean up