Step 3, more constants removed, optional injects