Simplify code
Add specs for destroy
Rebuild packages