removed unneccessary echos and vardumps