FALCON-939 Fixing few typos and removing unused stuff. Contributed by Paul Isaychuk