Cleanup some stuff

Signed-off-by: Kirill Enykeev <enykeev@gmail.com>