Cleanup

Some cleanup to config and links.