K.P.
its really hard not to react but that would be the best way to make it stop, if at his age he is going to stop. When there is no reaction from you it won't be so appealing to the little guy. he should be given the chance to clean it up tho, making cleaning fun/a game is probably something you want to hold on to. XD