cleaned up commented dead code