[REFACTORING] cleaning up some dead code