Further script cleanup up.