Add neocomplete and clean up