Cleaning up / preparing command executor