unused files deleted
findbugs bug fixed