Some cleanup

Signed-off-by: Mattias Åkerman <mattias@tunity.se>
Sub-events!

Signed-off-by: Mattias Åkerman <mattias@tunity.se>