removed unused/experimental code