Remove some tags for passing specs