Cleaning up linkage dependency for review