Rewrite tab completion
Remove prints and commented out code