Remove script
Add logging