As much fun as Org/Arch is, I'm thinking we can leave most of that and ASM behind, as well.

Not totally behind, but committing a semester to them as a course is what hasn't been working.