montblanc: init cleanup

Change-Id: Ic112e39da144d4a85481f146b8356ddaf9f8fbca