Remove workarounds to make travis work