Just removed hardcoded pieces.