Removing @Commons allowing 1.3.x+ support