more scripts cleaned up