[IT] Code clean up