Fix bugs with newer forge and clean up sources.