Removing Sabre/HTTP dependencie