Forge: Removed legacy stuff