Cleanup

Story of revisions.