Removing more 2.0 test crud