Assessed and resolved #TODO tags and removed some debugging code.