Removed unneeded internal methods