Simple clean up [GREEN]