remove broken if / else conditional