our friend Deprecated conversion is no more :)
Making sure we don't pass a negative key to an array
removing unused variables
Cleaning up this set of conditionals