cleaned up insertable state some more