TODO tags removed, cleaned up