Remove excess static
Update to build against 1.4.7-R1.0