Cleaned up warnings, mainly commenting unused event attributes