Removed DEFGENERIC forms that are now in class file or not needed.