Fix some scheduling bugs
Remove BodyType
Remove BodyType model
Minor fixes