Removed unused code, updated author refs