Doing some cleanup.