Removing echo and clean up