Removed redundant feature detection