[-] Remove more no longer needed code / now useless features. Trying to get the clode as clean as possible