removed code from master