TST-2 Remove all added in previous commit