removing unused methods and factories
updating badges for 2-1-stable branch
jruby: specs are passing but travis return exit code 1