V1.5 Remove obsolete constructions