Removing some logic I was using to work while travelling