commented, removed dead code, etc