tvgolo code cleanup