Remove trackable

Add some stuff for events