Refactored unused code!

Issue #7