General cleanup

Signed-off-by: Bleska <blecha.jiri@gmail.com>