Clean up and allow telling commands