WIP Remove API

Includes changes from PR #1086
Karma tests fail on my laptop
Let me remove soop and I think we'll be able to solve this