Remove old method, cleanup