further refactoring
remove some dead code