Removing old code
Merge branch 'feature/er-structs' into development