Improve sample data creation
Remove unused code
Fix rspec rake tasts