Cleanup on lab5