Code cleanup: Remove unneeded code
Added missing echo