Update the old system to use the new one

As the old API is now removed
Commenting some old code for deletion

Will be deleted if no issues arrise