MOB-319: Remove old code

Yup, exactly.
@bkoval