Updating cdh4 module
Removing unused stuff from base.pp
Removing commented stuff