Revert some changes that don't belong here or are no longer needed