Removed global stuff & scripts