This whole file should be gone if we are refactoring it away in favor of params