deleted functions that were 'D.R.Y.'