Some cleanup and Framework update.