Removed symbols that are no longer used.
Removed code that is duplicated elsewhere.