Removing calls to lang files
Adding commented code.