Removed code from incomplete feature