remove deprectated stuff