some organization and removing some legacy