Got rid of redundant checking for collision. Got rid of old files I had
forgotten back.
Updated makefile