Cleaned up from javascript libraries