Wrap - THIS WILL BE AMENDED BASED ON ISSUE 74
EditorIds - header ?
More unused variables
Unused variables that were likely just copy pasted removed
A couple more copyPastes deleted