Revert 50e82f9..2248a23

This rolls back to commit 50e82f9a20637abbbc2de8bff12d2da09f665656.
Revert 2248a23..e154a74

This rolls back to commit 2248a233de784c765cdbc888cd0ff2c0a57f066e.
delete some useless codes