Removed several functions that can be added in later JEPs