cleaning up - scripts now in separate files
Additional cleanup
Resolve conflicts