-A firebase touch is added and removing unused code