Few cleanup things