[caveman] remove leftover stuff, re-enable magic