Some general clean up and add Annotations.cs to the ignore file list.