Removed new code and fix broken completion provider