Updated CHANGELOG reference
Cleaning up more files