More of unused code was deleted.