modified resources + cleaning