CLEANUP removed Extend util class