Removed travis variable and some imports