[GENLINK] Code Cleanup