Removing test code, updating script