WIP Remove API

Includes changes from PR #1086
Karma tests fail on my laptop