Changed Title and removed useless code