Cleanup comments / remove dead function.