Removeing some magic