reorganized and deleted stuff