removed commented out and dead code