Remove remnants of forge in initial handler