Minor code cleaning, removing commented out code that wont be used.