Removed reliance on external scripts