Fixed bug 2739 and removing unused files