FP-145: removed stuff no longer required