removed things that do not belong here