removed relicts from old code