Remove commented out code
Remove a fixme that was a bad idea
Change a case to a pattern guard
Remove commented-out code.