Wups

Cleaning code, old good changes.