moved and deleted stuff