Removed Peach and Wallace dependencies.