remove unused api + adjustment