Enforce Java7
Some alias cleanup