Add neocomplete and remove conditionals