Nightmare: Fix Max for New OC

Change-Id: Ibf84d7566d888cd7ca181f689c5a0616a42f6f7f
Signed-off-by: Chester Kener <Cl3Kener@gmail.com>
Nightmare: Remove Junk

Change-Id: I446ac729874e27d2f3e514223d3559dda82247cc
Signed-off-by: Chester Kener <Cl3Kener@gmail.com>