Cleanup

Removed things around the merge. Also removed the stuff about changing
ranges and attack modifiers. Didn't make any sense.