Cleaned up calling of old JS