Solved [average time to fix] issue, code cleanning needed