Continuing Cleanup

Cleanup continues…