Fixes for ERRAI-528
remove uneeded method from previous fix