More cleanup. Remove some unused parts.