Removing calls to allow substrate or product to be 'None'