removing wrong module, addint new api