Revert "Identified Design Pattern"

This reverts commit cbd05bbda8cb0cd5561f1faac93f06eab28149f0.