Remvoes some old sentinel code from static implementation