Cleanup of unused/commented-out code