Undoing cleanup.
Continued unclean up.