More refactoring

Gift list, removal of outdated attributes, methods