@rafik: As discussed, code to remove.