stupid magic deleted, code cleaning