Fixed obstacle removal bug and oddity with resource removal