Cleaned up old todos/kludges.