Some cleanup

- remove out-commented traces
- remove out-dated comments
- use idiomatic "." instead of "$"