Fix travis.yml and remove obsolete code related to re-layout

Fix travis