drop code not used with new architecture