Some more cleaning, removing todo's as far as irrelevant