remove oneway overlay, at the moment it is more an underlay
some other changes made in fixme