Removed unused code
Refactoring...