Generative shapes removed and pr1