Update to new developments from Demigods.
Remove these.
Merge remote-tracking branch 'origin/master'