Remove deprecated code.
Fix for overwriting.