Removed unused files; fixed bug #66407