Refactoring, commented prints/logs, removed related logic