Cleanup shadow.h stuff so it behaves as intended