#683 Cleaned up.