Removed bit-rotted dynamic linking stuff
tidying up a bit