Removed residual refactoring garbage...