Clean up from yesterday.

Issues still remain.