Unused code removed.
More naming convention corrections.