[CIS563] Clean up