Add missing common routes & clean file.