meta info & clean-up

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