Removed dead code

Pruned code which is now in the API