Upgrade RSPEC to 3
Cleanup