clean up, user will get the error message of some getXXX method undefined when loading earlier 5.0 bundle.
Merge remote-tracking branch 'origin/master'