Code remove extra debug and not used data