avi refactor to single post remove get