Cleanup of definitions before refactoring
Cleanup of definitions before refactoring