rest refactoring 4th
remove all static