Remove unnecessary changes made to the existing code.

Issue #18