Remove a few obsolete things to keep us out of trouble (NFY)
Update ignore files with latest adds