Fix enemy collision bug.
Remove unnecessary logic.
Merge upstream