Revert "Added goblin base model"

This reverts commit 681f67d26036e18fb03953db2bdc645a279f0984.
Added in unmerged files