Remove class
Second merge nikitsky/master with lepilkina/lepilkina.