Merge pull request #483 from LipuFei/small-cleanup

Small cleanup
remove notification
remove Lang
some fixes
some cleanup