Remove some commented code, fix examples