remove old class, fix 1.5 stuff