Remove over-engineered code