Related to issue #1 - Removed unnecessary code