Fixing previous cleanup