removed residual part of old code