Remove old and extraneous files.
merge
play with the rules a little