Clean code from useless actions