Finalized cleanup from today's work