Removed swp cruft