Cleanup and added back completion.sh