remove old duplicated file
Move the horrible router out of the way
Use collection state as the authority