Minor cleanups

Removed commented and unused code