Simplifying deploy script, removing some workarounds