Remove Future Feature Code