Removed some bad find and replaced