Remove define
Remove TODO
Merge nikitsky/master with lepilkina/lepilkina.