Cleaned up that last merge