remove rewrite
adjust location