Let's remove if deprecated.  We are building from scratch not sure if we need deprecated stuff already.