Remove adapter, simplify paths