Cleanup

Pulled in fixed from diveintomark