Cleaning up the CommonHelper

# Don't merge yet #