Remove redundant code
Remove variable and make circuit