Removed magic

will add it back in later once a more flexible system is designed