Trying to clean the stack when starting over.
Refactoring
Removing redundant argument