Dropped for rewrite

Dropped for rewrite