remove non-related code