Add Properties/AssemblyInfo back in, cleanup csproj