simplifying codebase, marking all errors unchecked