Clean up dead files + Added events to ForgeEventManager