rm stupid nullable fields