attr cleanup