Started to remove Clam dependencies