refactor, remove non-related code