Remove this until we can get better logic in there (if we do)