refactor and remove unused member