removes todos
switch to use if statement for config check

makes jshint happy
cleaning up todos