Removed some code breaking the script