Remove dependancy on Sawyer's site