Remove some failed find & replace attempts, #56