cleanup, removed duplicate actions