Merge pull request #203 from ping19/master

Remove unnecessary logics updates