Remove wagon dependency