Refactoring and removing dead code
More Refactoring