code cleanup

trim dead code