Removed code.. need to check usefulness