Continued cleanup of older code