Cleanup of methods that access preferences