Clean up and Setting up Command Service