revert some unnessary changes