* Also remove 2 non declared but defined functions * Make some functions around const ref changes const