removed some extra unused code