cleaned up combat stuff