[TASK] Finished refactor, removed debug