Changed title, removed useless code