Cleaned up before refactoring