[clean6] Final clean up before submitting
[bug8] fixed grunt build bug