Removed old api code (fixes #121)