Removed extraneous duplication, fixed building with 0.9.0