removing old pre 0.6.0 stuff