Some cleanup;