Remove unneeded and update with our preferences