remove event stuff until we have everything sorted out