Remove more unused code

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>