Reviewed issue #106.
Removed unnecessary imports.