Did some cleanup for productive usage

Signed-off-by: Stefan Venz <ikstream86@gmail.com>