WIP Remove API

Includes changes from PR #1086
Karma tests fail on my laptop
why did you change this? this is probably the reason it's failing in karma