Commented out stuff due for deletion in next pass.