Refactor to use only Ajax and Raven