Clean up

MOD - cleaned up unused stuff, extra commas, empty initializers etc