Agreed.
Actually the best is to stay with your code once you've cleaned everything and not try to integrate anything new coming from "boonex", else you can expect bad side-effects and new bugs.
By the way, especially getting rid of all the Ray stuff is probably one of the first priorities.
Things to be found on http://modmysite.com/
Regards