Cleaned version

No old commented code.