trying to clean old code