Some cleanup
A bunch more cleanup
ignoring one more file