Consolidate weak surfaces

Coming soon