Cleanup
Add redstone