Assignment 2, clean up required