Cleaned up the script by removing some commented out useless stuff