remove state cache related code