Accepted all changes, some clean up.