Some cleanup

Signed-off-by: Sovak <sovak007@gmail.com>