Deleted methods that are now in core.
Minor cleanup