PLATFORM-392 Remove TODO