revert back some not used parts.