Removed feature toggle