Cleared a bit the code from what was useless now.