Removed the completion stuff I've been carrying around that doesn't work