Resources removed
Merge branch 'testing'