revert some code not pushed to github yet