Remove unused states; Move pins below Pin class