Take out error logging