script changes - removed bloated code