Updating scripts and cleaning up using statments