Removed unused pieces