major depracation cleanup on old code