Switch unicorn out for puma
Cleanup