Simplify scripts significantly