Simplify initialisation logic

Change-Id: Ia8df25bc2d06c7a53c18e869aae87bac901321ac
Merge "Simplify initialisation logic"