switch to api, added remove address feature