less debugging please :)
remove old class