remove magic stuff; might be causing 504