removed now redundant @Optional code from coremod
less debug noise from coremod
finished converting moving handlers to 1.7, cleaned up a bit