Removing useless code and changed title