updated refs, and remove components