Cleanup since this is all static now