Remove some now-unneeded custom code (fixes #14)