Revert some unused code