Took out strcmp check
Took out deprecated code