Remove Buy and Borrow types
Remove commented code from factories.rb