Massivly simplify encryption (it didnt alwyas work correctly)
Remove uneeded methods