Anne cleanup

Anne Bernabe scripts, cleaned by Adam