Remove some of the dependencies on fenhl.net