Extended version

Remove commented code?