got rid of todo crap