Merge pull request #3113 from ace20022/cleanup_guilib