Removing forge dependency in this branch