Remove segfaulty code (what?)