Revert some useless changes