Clean Local

Cleaning up local mess and seeing if locals_only can do the job later
in the script.