FIxes to support core changes. removed unneeded methods.