Updated apipie and removed JP's hack