Fix personal-preferences and cleanup unused overflow