Massive noexcept check; cleanup