can these changes be removed as well now that this has been cleaned up? should we keep this in still?