remove_black_magic

Black magic removal