Localized

Let's remove all the commented out code