Cleanup, comments, removing defunct items.