Remove unused accessor and refactor code