Cleaned Analytics code
Cleaned Loader code