[Code Cleanup]
6.8-dev checkpoint