Removed the last of Alex Chadwick's code (belated thanks) and changed the LICENSE to reflect this