Next pass through the framework. Also removing boost files since we don't use them...