Revert "- auto-complete, + company"

This reverts commit 7678da3a1b02873347a2d9e0fca29ce8fc333dfe.