Remove unused code
Add travis support for all branches