Removing depricated code.