remove unused method
fix some findbugs problems
remove some technical debt