Rodrigo merging with master

Can we take out the commented lines and print statements.