Code clean-up

Changes:
- removing unnecassery code from codebase