could not implement new remove, reverted back to functional old one