[TASK] Removed some debug code from functions