Small edits removing unused code