Assignment 4 cleanup