Deleted some unused parts