Started working on the removal of HTTPS requests