Remove extra circuitry
Update components