Closed #122 by code cleanup.