[BUGFIX] Removed duplicate functions