Cleanup semester 2