Removed testing vars