Remove commented code
Commented out code to be refactored

The idea is to refactor code and bringing it back to life, piece by piece.