Fixed API to remove extraneous methods.