Cleaning up and refactoring code inside GLUS 2.0 draft version. No
interface changes.