Cleanup extension and hw integration initialization

Change-Id: I84dc6581b93c213c88762dc3477b8f932d08519b
Reviewed-by: Andy Nichols <andy.nichols@digia.com>