Enemy Removal Bug

Fixed bug with enemies being removed. Also made collision detection
more performant.