Remove unused code
Fix noreturn comment for forwards