#648 Remove a very big piece of code