Clean up old code and standardize links