Reduce the load on travis
Code cleanup