Remove unneeded structural elements

Per #185.