Removed swap check
Removed system_swap check