Remove unused constructions