Updated functions
delete swp