further cleanup

Signed-off-by: Sebastian Zarzycki <sebastian.zarzycki@gmail.com>