clean methods v2