bogoed out a refactoring. Still probably not working in release mode