remove dead code
replay commit #e339f78
replay commit #78bca25
remove dead code