Code cleanup.

see #585