Removed more raw Ajax calls