remove depricated code