Non-necessary code cleaning