clean up remove unnecessary events, test pattern