Removing unused functions.
Removing unused libraries #7120
Minor - removing metadata table, removing require/include
Updating from 198