remove broken if/else stuff