Remove a few unused parts