removed unused or incorrectly set up pieces