Removing uneeded echo and commented code