Removed code which is related to depricted one