Clean and optimise media profiles setup

Change-Id: I28e976831d543ac6279d676dd93ebc9c877f55b9