Solution patch up

Removing dead build configs, again. Adding in Office project that was accidentally removed by Jun's pull.