Removed/replaced incompatible code.