Updated forge, removed unused code