Cleaned up unused helpers.