Remove uneeded stuff and try and fix links