Remove unused code
Update sketches