Cleaned up some redundant interface implementations that crept in over the iterations