meta info & clean-up

Change-Id: I94c4a49af8f56ab622e88f8be12084bebcf48e52
Signed-off-by: Matthias Steiner <matthias.steiner@inscope.net>