CameraWrapper : More Cleanup!

remove unecessary hacks
@joebonrichie @lozohcum