First final draft of this role
Removed swap files