+ removed unused functions.