Removed procedural interface and tests