TODO maj, cleaning