WIP Remove API

Includes changes from PR #1086
Karma tests fail on my laptop
Well it's specifically there to make tests work :c
Once we remove soop this won't be needed