Refactoring

Removing unused code