Removed broken link args + some other cleanup